remove unintentional collision with errno. (#636)
authortsteven4 <13596209+tsteven4@users.noreply.github.com>
Tue, 25 Aug 2020 20:48:21 +0000 (14:48 -0600)
committerGitHub <noreply@github.com>
Tue, 25 Aug 2020 20:48:21 +0000 (14:48 -0600)
this caused compiler failures with gnu++1z.

gbfile.cc

index 0884798c4b6dd58328ad9ed61343bb1ea40aa1d1..a4bbfec310fa125c1989c1677ff2ab67ecbf904d 100644 (file)
--- a/gbfile.cc
+++ b/gbfile.cc
@@ -26,7 +26,6 @@
 
 #include <cassert>             // for assert
 #include <cctype>              // for tolower
-#include <cerrno>              // for errno
 #include <cstdarg>             // for va_list, va_end, va_copy, va_start
 #include <cstdio>              // for EOF, ferror, ftell, SEEK_SET, SEEK_CUR, SEEK_END, clearerr, fclose, feof, fflush, fileno, fread, fseek, fwrite, ungetc, vsnprintf, FILE, stdin, stdout
 #include <cstring>             // for memcpy, strlen, strchr, strcpy, strncat
@@ -306,12 +305,12 @@ stdapi_seek(gbfile* self, int32_t offset, int whence)
 static gbsize_t
 stdapi_read(void* buf, const gbsize_t size, const gbsize_t members, gbfile* self)
 {
-  int errno;
+  int error_number;
   gbsize_t result = fread(buf, size, members, self->handle.std);
 
-  if ((result < members) && (errno = ferror(self->handle.std))) {
+  if ((result < members) && (error_number = ferror(self->handle.std))) {
     fatal("%s: Error %d occurred during read of file '%s'!\n",
-          self->module, errno, self->name);
+          self->module, error_number, self->name);
   }
   return result;
 }